merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 13 Nov 2006 16:58:23 +0000 (09:58 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 13 Nov 2006 16:58:23 +0000 (09:58 -0700)

Trivial merge